Merge from emacs-23; up to r100587.
authorGlenn Morris <rgm@gnu.org>
Wed, 25 May 2011 03:45:04 +0000 (20:45 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 25 May 2011 03:45:04 +0000 (20:45 -0700)
commit4dedd05546c0301f9432f0c7be2a6f44a7def6cb
treee7acbcfabd1ec3c7104adc318591082a90f4cd3a
parent9750ca68c62ae8db7e2b8dfe1e5162e971f3c146
parentfe1932b6354cbfc39da880b161ea294f08411ec0
Merge from emacs-23; up to r100587.
src/ChangeLog
src/dispextern.h
src/dispnew.c
src/fringe.c
src/xdisp.c